Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev
am: c7ed1d771f

Change-Id: I0ffdf433f50d14f9b2000eba363e5252a2b3e93d