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

Change-Id: Ia89714d3a7cacd05e7a589789b7cdda816564a9d