tree 890354c5ac0c7a80ed7437198d1b041588529f32
parent 22446777c2fea5abf12b39f851ced1c7445648f4
parent 9f9129866cce570b4d865efe93a2dfd47838cb69
author Hall Liu <hallliu@google.com> 1519337504 +0000
committer android-build-merger <android-build-merger@google.com> 1519337504 +0000

Rtt bugfixes, part 5 am: dc719d4f10 am: 0ccc55626d
am: 9f9129866c  -s ours

Change-Id: I2b5ceb63dba894b82ccfa2367d5c09ea205c1d64