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

Change-Id: I0fdd8f0d780644833cb250b36c212bcbd8bf799b