[automerger skipped] Import translations. DO NOT MERGE am: 0f5574a23d  -s ours
am: e0ad213ab2  -s ours

Change-Id: Iba345ecb03d6b1a85013b8e24109258de0bde578