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

Change-Id: I118917657a53123309d5ae7398c0af07726de1a6