Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev
am: 105ca148a7

Change-Id: Ied32436daf608f10780ebed67465bed541bbfe8e