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

Change-Id: Ia2660a67af0c42548fbb96259cfac7a1734f468a