[automerger skipped] RESTRICT AUTOMERGE am: b4aaa9d8ad am: 6015cb062b -s ours

am skip reason: subject contains skip directive

Change-Id: I66f826012d2a4fc4c6b8e808d02fa2c6b151fe49