[automerger skipped] RESTRICT AUTOMERGE am: 86436360 am: dcb3aca7 am: e7b391bf -s ours am: 62d1104f -s ours am skip reason: subject contains skip directive Change-Id: Id9d0d58a82a17ed795f111d433369744c9b9d996
mentioned in commit 49a60cea