[automerger skipped] Import translations. DO NOT MERGE am: 36d0f3141d  -s ours
am: 07980f3a2f  -s ours

Change-Id: I5c4b515043fe29cb99be33e2537128222ca57cd9