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

Change-Id: If6fbfad52a3378400cb2006671a961c7413d317c