Merge "master is now P" into stage-aosp-master
am: 3bb60f4c6e  -s ours

Change-Id: I63901f1277addce8f8a805f654a783313815a31f