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

Change-Id: Ibf2a49b9faadccd17eade8bef600aba75e4011d7