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