Merge "Relax the passing criteria for testOriginalRefocus"" am: 9b99922829
am: 5673ecdabd

Change-Id: Ic53e6654c84c44274c5da295859e67a65a20b33f