[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: cfb0e05e03  -s ours
am: 55a7fe77a7  -s ours

Change-Id: I23e3bb1797c0d7c83721f445183476e8e1f833da