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

Change-Id: I5db1474051e8e1208e403ed0869eae3c158e72ed