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

Change-Id: I7e821c20149cd8ee205cac778b7cbb3e9328208f