Merge "Fix test location provider bug" into pi-dev am: 4f79a18cc5
am: 542c52372c

Change-Id: Ic45d9f719ae064085a598024be85d13a4f3a00c3