[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: e4cd8fe5e0 -s ours
am: dc832d6481 -s ours
am skip reason: subject contains skip directive

Change-Id: Iade3c17a904c93fe80af71962635d0a36012d5d0