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

Change-Id: I7ad44397686595a2a897252da53583c443c692b8