Merge stage-aosp-master into pi-dev-plus-aosp
am: 371a8eee48

Change-Id: I3ee924a858be4bf66a74bd05eb1df7cb32990bb9