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

Change-Id: I3a5a43d20969a1cef2170edc3be725aa9efb9a4d