[automerger skipped] Import translations. DO NOT MERGE am: 60cca7bd02 -s ours
am: 3305f13c8f -s ours
am skip reason: subject contains skip directive

Change-Id: I9445d404091bb13b988dca841fa4405a2dc6b9cc