[automerger skipped] Import translations. DO NOT MERGE
am: 28d5f8ee15 -s ours
am skip reason: subject contains skip directive

Change-Id: I804d64e1a3a0cf04d5861b845bda72a6275e7925