Bug: 24555166 Test: RSTest on x86_64 emulator Change-Id: I0c8c970ce85989c3213fb4986e517ac0be5beb26 (cherry picked from commit bb671376ff85066499bf59e32d6138a73fb06f91)
Bug: 24555166 Test: RSTest on x86_64 emulator Change-Id: I0c8c970ce85989c3213fb4986e517ac0be5beb26 (cherry picked from commit bb671376ff85066499bf59e32d6138a73fb06f91)