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

Change-Id: Ibbb57bfdcbfa9f85504a07852ecb754fd9774f77