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

Change-Id: I8d24af72b2bb061b11059f94324069a5b6b75a47