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

Change-Id: I402904753a20804e8709e8873e1a8962bb2d8056