Android 8.0.0 Release 16 (OPR4.170623.009)
Merge cherrypicks of [2804820, 2804821] into oc-r4-release

Change-Id: I2cb16cda5fbbba19df91891cd97137074421a297