Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev
am: dedfb2ca1f

Change-Id: I7072dfc37d644226d37689f4313ecf0ea19f7c28