Merge changes I6ae9881e,Id5aec329,Id0ebe6c8,I4135107c,I7f42f0cc into oreo-cts-dev am: f5eb3bf29b

Change-Id: If0bbbc8bf75b8a7a218e45994b8e556fcb6bd20e