[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ae571ef6e3  -s ours
am: 6c2f64e9ab  -s ours

Change-Id: Ieaad6972fda48906a7f9eb207a00da9e23c69aaa