Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 39c108fac8

Change-Id: I7417a098895e71b816317230abc8d717b855cec7