Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 2962c2dced am: 7974473bae am: f55d460373
am: 1e2db7fda9

Change-Id: I63e587bf56e2bb33a9389cc542668d0b6df38e1f