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

Change-Id: Idb60b77a4bf4efae46d687de4057787c209b05e4