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

Change-Id: I808d69d15e7c9554b85fc0d264fd0d04a3dd56c8