Merge "Remove the debug code for bspatch flakiness" am: a9f9acca91 am: 04a6af06fb
am: 8997247a5e

Change-Id: I9ad7a6a204dc7b416369bdb08a06370164e3aae8