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

Change-Id: Ieef46c0846657f5279b67dd7d2f437e1ffc673e0