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

Change-Id: I8abb787d2ae5f2a6b714b144a2247620241eb6e4