Merge changes I6ae9881e,Id5aec329,Id0ebe6c8,I4135107c,I7f42f0cc into oreo-cts-dev am: f5eb3bf29b am: be13fa439c am: 8d8d63edfd am: 3301efd1e3

Change-Id: I2aeaa006ae06996e3a9c74449fe188cb594aa95f