[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: df3e39e5de -s ours
am: d3115512d7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8fa95cbcc4843c6d0c826c11cae5a48c77617df