[automerger skipped] RESTRICT AUTOMERGE am: 60a6583adf am: 20cd95a7f6 -s ours

am skip reason: subject contains skip directive

Change-Id: I4600da20109a75e986c0e8988b493b9a0715b34c