Merge stage-aosp-master into pi-dev-plus-aosp
am: 5fd84ddcba

Change-Id: I1424455e8e51d863945c9663a97bc793852df13b