Merge CTS-related change

Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b