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

Change-Id: Ie445497f8b15cc7aa2631061f732f73db0b11e9e