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

Change-Id: I141bb7842fc265615f11538306afe72b01dda249