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

Change-Id: Ib2951aec554167b13c9c5000dae4dbbdd2975587