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

Change-Id: Ic499dfd7dd3e4b1f12e093e5029b184a31051ed1