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

Change-Id: I16c17dfa3cad2dc529131d2b64cd946bc9adb4c2