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

Change-Id: Ic84f6809d553296ebf00f43c1bd64706f3992e22