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

Change-Id: I1defbdd89ebed4a9917d4f99a9c5e5f37501718d