Merge "Add @ChangeId for CTS test" am: 8e08b87e82

Change-Id: Iedf068f910721679097ccd0f222e844c2448f837