Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
am: dbfdb95147

Change-Id: I66ed82cb57385a628f905f4f62cdfab3d095faf7