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

Change-Id: Id4c3df0e421d33193ec7813051c52ea55438271a