[automerger skipped] Import translations. DO NOT MERGE am: 835fe035b8 -s ours

am skip reason: subject contains skip directive

Change-Id: I4615daf9dc689ff00d30ffc49bc6f4abe6141023