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

Change-Id: Ie94067e5fd97889bdc43dd476b4bbd8b0cab9693