Merge "Changes to fused location hardware hal."