Merge "Import translations. DO NOT MERGE" into pi-dev
am: 9331af7220  -s ours

Change-Id: Ib91e7e1c4c5a066c2191c29ad1f6df7ca7a0f14f