Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 322c100598

Change-Id: I0302b7018535e85bbf63214cf72d35b772cac411