Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev
am: d9aadde604

Change-Id: I9a9f644d102fb0bf576806a450fcb70bfc428ddb