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

Change-Id: I855f9c975ac3068bd512b1d69ff430ca038e2f49