[automerger skipped] Import translations. DO NOT MERGE am: 7deb0827f0 -s ours am: 5e79b8085f -s ours

am skip reason: subject contains skip directive

Change-Id: Iac32fb415c5e36e36ac71c7a3de04160306ce692