Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I6777a437d47e4e047d3613c670da11e3452a4c81