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

Change-Id: Id6420196308929e3dd4dfb4f97c29da4f3803fca