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

Change-Id: If2a23056a58d2e7939d72249efdaa214061c5417