Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 6b8bf72c06

Change-Id: I14c2ff5d6cdbe29ac3482e1e8269945894bf82ce