Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b1aad16b4a -s ours am: 20cf07b649 -s ours am: 0a6a380748 -s ours
am: 9ec951472c -s ours
am skip reason: subject contains skip directive

Change-Id: I63385ffa567ee432e93164c96dbb5f4d6cd31221