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

Change-Id: Iac57959ce70a16ca4f3952463ef969c2e68064df