[automerger skipped] RESTRICT AUTOMERGE am: a9211d687d am: 8f258aaee1 -s ours

am skip reason: subject contains skip directive

Change-Id: I3cc84fc4ece34137a16c4371351083346bbc025f