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

Change-Id: I6807eedd12c0731ad5e33352c50c647ee3bfae1f