[TEMP] track jb-mr1-release branch of cts

Change-Id: I550fc4c0671cdeba233bc08a1d3832a0054071ac