[automerger skipped] Import translations. DO NOT MERGE am: 7deb0827f0 -s ours am: 0fb905ba4f -s ours

am skip reason: subject contains skip directive

Change-Id: I0a1a65e5eb8dd8cb7f56c2b94c41bbbf4f1b4799