[automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b1c am: d6f71caed5 am: b1fd7196e1 -s ours am: 102e9c5905 -s ours am: 5fc924b419

Change-Id: I7773e3bf6e75248f352da3b2c7cc416ba6af6f95