Android 8.0.0 release 23
Merge cherrypicks of [2846958, 2847366] into oc-dr1-release

Change-Id: Ie4071dedf6f6af29abb740901610e569f57dea1c