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

Change-Id: Iceed228c6f7c86630d457d19a4844888dfcfb7ea