[automerger skipped] Import translations. DO NOT MERGE am: 0a2ed801db -s ours
am: 61564d79ab -s ours
am skip reason: subject contains skip directive

Change-Id: Iac12de84eb9ca67cd947325a99be68aee17f45b6