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