[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours
am: 2a5ccbbe9d -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9a792a43b70324cfcd154076eddf5809b96fddb