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

Change-Id: I7d1e3300f006935163118e46e561af15a5652b3a