Merge "DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53c -s ours am:...

Merge "DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53c  -s ours am: ff115bff am: ccbac7e9  -s ours am: 76007bb2 am: 219d9b5d am: f05a6fc5 am: cf7ce06a  -s ours am: f44b48ac am: aa8976fa am: 783253f6 am: d2c4007d am: 982cf0d2  -s ours am: 4607ec8f am: ad09c7e7" into oc-dr1-dev-plus-aosp
am: 1ccec781

Change-Id: I539d83d710a1814dcf93fd0a8a5e782d82c4ca88