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

Change-Id: I515adc3e8a0a534fde521ec1f0ff909b53c28057