Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev
am: 0eeb6c53d1

Change-Id: Icf7f366eaa4acfc637c34747af931d9486465595