Android 8.0.0 release 31
Merge cherrypicks of [2524909, 2524910, 2525349, 2525350] into oc-release

Change-Id: I7d8c9857a6452a163f60a9fff60a2c81f8726678