Merge "Fix cts." into pi-dev
am: 3e389a8490

Change-Id: I9d9ddb90f8917904187a022e27a7139e61276c75