Android 8.0.0 release 29
Merge cherrypicks of [2822671, 2822672] into oc-r2-release

Change-Id: I576bf12ec19ac10b92c1bc79dfeb4b1915d15a30