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

Change-Id: I678c70d43d7cc593f6a0ab7477cdaf9366cc7922