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

Change-Id: Ice3fbe6bd995f0dd0bc7983775c94049144e7528