Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 42ac06e560

Change-Id: I9fbabaa7eff0f2143448d54cc9de665a19fbb662