Merge changes I6b247672,I9ef52453 into oreo-cts-dev am: 180da6fcbe

Change-Id: I18070c8fdecbc8d313ff174c606e20a4932cfa9f