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