Merge "CTS for b/64536115" into oc-mr1-dev
am: 090296aa57

Change-Id: I6170eedc26178efd14112b53f28b1b3cf2befcb0