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

Change-Id: I1669475b779466aea762450f90f8a6ae4abc3750