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

am skip reason: subject contains skip directive

Change-Id: Id9b3d01ace1da88c84d9be55fde27a9e52a5260c