[automerger] RESTRICT AUTOMERGE : Merge commit '2088ac33' into am-a8cd5e26-07f4-4cd8-b864-028c7e3ea879 am: 077dbfa4 am: 2686fd7d Change-Id: I4a0235299b4fe6da5ac49134ba553b6134c32ab7