[automerger skipped] Import translations. DO NOT MERGE am: 4e50d9b0f3 -s ours
am: 373c3c17c7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia7749cce9f35a568780721679574a79d6b133b08