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

Change-Id: Id1841033a2eaa4c93e0eef39f4dc45ff220d453d