Android 8.0.0 release 23
Merge cherrypicks of [2813966, 2813986, 2814006] into oc-dr1-release

Change-Id: I6c72cddd8bf5ae932d61cd51b9b2cd8d7aac4eca