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

Change-Id: Id87cc1414987dfa09771148a1d5f03fb97180bb5