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