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

Change-Id: I257a6d81716ba450167820d59fe3eed0bdb9b4e5