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

Change-Id: I763261e393228b063729135b2cd1afc7dc40222b