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

Change-Id: I8dfae821b99dc36bcb0aa3ed8a15ef9259e45558