Merge "Relax the passing criteria for testOriginalRefocus"" am: 9b99922829 am: 5673ecdabd am: 5b93786abd
am: 31f33c05d3

Change-Id: Ife5347aec83b670955ba2d3f106bf96a09fe9353