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

Change-Id: Ied77290b2319bb87191c41e375cee9c0365a4a82