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

am skip reason: subject contains skip directive

Change-Id: I9c30e381c7422deee0a90208af43c37279f9ef62