Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d
am: a2c2182b65

Change-Id: I6498dcc83ed0b30850ae9cc1e94af1510bf89836