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

Change-Id: I8d6f88cb109c53c30f409815f5ef8137877bf789