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

Change-Id: I92e496676c2a623b37017245134b2ace72221402