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