tree 2e36be175fc897e6948740d29f40002dda233199
parent 6e66ce3cf4b7e656f53fcb5518b3b0f5713d73f3
parent 0ccc55626d633dfac9c6087fd7b94943a221da37
author Hall Liu <hallliu@google.com> 1519336749 +0000
committer android-build-merger <android-build-merger@google.com> 1519336749 +0000

Rtt bugfixes, part 5 am: dc719d4f10
am: 0ccc55626d

Change-Id: I97dd05297575a30e4a0bc7f19c62b15df31cdc24