Merge "Make TileQueryHelperTest less flaky" into rvc-dev am: c59312aaec

Change-Id: Id58afd1aa152f9a9e24cccec6bed050341b31bfa