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

Change-Id: I4d460c8fd412c59964455dbf7190dfa2c0a9995f