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

am skip reason: subject contains skip directive

Change-Id: I1d0c4482b4dbaa35fd47bda9a2444bf3f6386d8f