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

Change-Id: I2e29a7f60db399922822459d8e686d08ad4fd3a7