Merge changes Ic7cf89fe,I9ea94267 into oreo-mr1-cts-dev
am: 20be2bff15

Change-Id: I320b39a83cb6974ff1a3e72feeefb11f3a04f3da