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

Change-Id: I233af18264e39ab971aca60da4da913764daa728