Merge stage-aosp-master into pi-dev-plus-aosp
am: 0bd1ca7706

Change-Id: I9bcbb81e1bc016e36fceda624535801b92cb576b