Merge "DO NOT MERGE: Do not inject mock location to chipset" into qt-qpr1-dev