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

Change-Id: I0d862e76a66fe0801b3a4095e7269b14c057471f