Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: dc69e17d4f am: 61a8ce7484

Change-Id: If2f98ffb2c9598f02f13b96824d71f2445b93236