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