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

Change-Id: Ia7f209fe6fe25558172c57e29df92c72f2e76991