Merge stage-aosp-master to aosp-master - DO NOT MERGE am: cff2b0cef9

Change-Id: I4620377fae8fdf13868adea8c94cece374b8cffb