Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev
am: d1f18aeba3

Change-Id: I2610da3036eedc3f748f6e0935bca336fb89fc0b