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

Change-Id: I18f29e191db396b300604a582841daa78925df40