[automerger] RESTRICT AUTOMERGE : Merge commit '2088ac3315cc3c292ea30d5c0a071bdf3b1e9dbb' into am-a8cd5e26-07f4-4cd8-b864-028c7e3ea879 am: 077dbfa4da

Change-Id: I93756f6d88b24a6611fa7786d9e431a2a15bbdf7