Merge "Merge remote-tracking branch oreo-mr1-cts-dev into master."
am: 740e1a8b57

Change-Id: I5089a3464410b932dfa853c8d275a3e457386459