tree 53a41c09f94b8f8b4e930513d07dd84a93391c13
parent 2f8f50198d76d47f5be963954783e727656e1971
parent 5748b7788c502a5022e9d185cdef3e1d8d361672
author Wei Jia <wjia@google.com> 1512184879 +0000
committer android-build-merger <android-build-merger@google.com> 1512184879 +0000

Merge changes from topic "Fix for 65483665 (lmp-mr1-dev)" into lmp-mr1-dev am: a54aa363c8  -s ours am: 859ad76dc9  -s ours am: 0d22f58bee  -s ours am: 75d21f33d8  -s ours am: 54c62e6bec  -s ours
am: 5748b7788c  -s ours

Change-Id: I07901a95ea1699bf23d3edfe96820f38baf4c725