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

Change-Id: Ic5a2e499dc23657360a85aaa041010f6b76bad58