[automerger skipped] Import translations. DO NOT MERGE
am: 465ff075de -s ours
am skip reason: subject contains skip directive

Change-Id: I25491a2b9c6f3544017650252b24d3886417e1e4