Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: bcd8333b34
am: 8dd7fe724c

Change-Id: I2aa58504d0856a381f34a1febd9bcb380950acc1