Merge "Merge "Remove CanvasCompare." am: 688256e5d7 am: 0263395aeb am: 158bd35c52"