Merge "Always request coarse location with fine location" into qt-dev am: b17b60c3b1
am: 9c90c1307a

Change-Id: Ia6eca2c63062d09f375b31bc5485d3a8729b23d5