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

Change-Id: I6fdb44ebcfd0e3f0080197681dfd7c52d522cfe8