Merge "Restart location requests after HAL restarts" into tm-dev