Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev
am: 36e3d3ccf8

Change-Id: I9883f8b542bab40c8db4de1c8a768fd12b04a3c2