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

Change-Id: I83cca39db5449c667746a9980809f699c09beb52