Android 8.0.0 release 33
Merge cherrypicks of [2912773, 2912157, 2912774, 2912159] into oc-dr1-release

Change-Id: Ieca8468448dcd80ebc206d165534fe9c77779b9b