Merge changes Iee17fa80,Id9ee50be into lmp-dev

am: 9e63540d01

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33
This commit is contained in:
Adam Seaton 2017-04-12 23:02:45 +00:00 committed by android-build-merger
commit 12e0186aa1

Diff content is not available