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

Change-Id: I732565304e7c4c9fdebc09f0f30f80eca85cd57b