[automerger skipped] RESTRICT AUTOMERGE am: 0bb93d4b am: d6f71cae am: b1fd7196 -s ours am: 102e9c59 -s ours am: 5fc924b4 Change-Id: I7773e3bf6e75248f352da3b2c7cc416ba6af6f95