Android 8.0.0 release 29
Merge cherrypicks of [3063760] into oc-r2-release

Change-Id: Ia0baa1ad2abbce60d8935e934715d2b1d0b4119e