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

Change-Id: I4232bb605673dfd1db47eefc685954ce7f89c0c9