Use localisation

Change-Id: I1d0917f3a7df7a8bde02a1c91a4e84bb066060b7
Merge "Use localisation"