Merge changes I452e051c,If35ceac5 into oreo-cts-dev
am: 426516cdee

Change-Id: I7ff86dd7d9aabbd8bae5a775c02906fd7d2928e1