[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 5587dd9b -s ours am: 1b11bc8f -s ours am skip reason: subject contains skip directive Change-Id: Ibad6ff72f0c86671f336184486eb4eed1c860b7f
mentioned in commit 870c688b