Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev
am: 5d90275b6e

Change-Id: I78658a04d27b680f8863dbdc3eecf57b45087aa1