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

Change-Id: I2b7a496a407e865dee5211932d3218434cff32a4