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

Change-Id: I65dd67f811e4c464cc8a60cbbb51ea349c544fba