[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 21e7d01bdf -s ours
am: 149ccf3740 -s ours
am skip reason: subject contains skip directive

Change-Id: I50d1d61e9c6bd9dfa62562772171c56da6edc873