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

Change-Id: I5215f7b8b82b0aa9ec598cd0d8de3848c5bef3fb