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

Change-Id: I81681b7bd463b07adda40e317773b7e9cae306f2