Merge changes from topic "am-2a4e90f7703143d886dabbb140c9541f" into oreo-mr1-cts-dev
am: 82f5ec9915

Change-Id: I56dbac15597780e219893d3d13c7706165aacdb3