Merge "Test runs on devices that don't have a GPS provider" into klp-dev
am: cb8d53c1af

Change-Id: I8a4b36e70eacdac96412d589d59d314b265105e8