Merge remote-tracking branch 'notsyncing/android-8.1' into o8.1-los