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

Change-Id: I24f288c602e9699698d64b60cdaa47f67749e044