Merge "Merge branch 'release-66-1' into aosp/master"