Merge stage-aosp-master into pi-dev-plus-aosp
am: 67185d3d43

Change-Id: I4f3662b156e44ec59279df40a49956b482f4bbce