Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 91fbf0a0a1 am: 2ff71c4202

Change-Id: Ie8dd90805053e8611a920a2e948baba13aa9c1c3