Merge "Merge branch 'expected_upstream' into aosp/master"