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

Change-Id: I16a40588cbae2f690da8946abd50faeb87005908