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

Change-Id: I989bdd6293d63f8cad8ae0b9d499b53cf12188eb