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

Change-Id: I332aa1eccd0e8f671486d6f0f4003b4281664dd9