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

Change-Id: I3f0dad270573e7af8988123d50d96ce6323efec3