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

Change-Id: Ia5cfa7bd1086e6ae59eb969a4c7cd520285afb80