Merge changes from topic 'cherry-pick' am: e3d5fa1094
am: 12b4883032
Change-Id: Icebffbcb4057e278d7b7c42448ac4e626060eaeb
This commit is contained in:
e3d5fa1094
am: 12b4883032
Change-Id: Icebffbcb4057e278d7b7c42448ac4e626060eaeb