Merge stage-aosp-master into pi-dev-plus-aosp am: 98f7e48acb Change-Id: I4852adadfbc76e6a161893cf6ba92e8df727a753