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

am skip reason: subject contains skip directive

Change-Id: I0350f17bd8488903fd4971d0b9fc58b4a941f7b2