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

Change-Id: I944228d513792c9a94c6271698af0b48919c9267