Merge changes from topic "asb-2018-04-o" into oreo-cts-dev
am: 6977a333a5

Change-Id: I7c4d9e4ee3339a65bd7da67674d932813b588725