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

Change-Id: I843068bc8b040325f7abe0b885771af4fbf90c82