[automerger skipped] Import translations. DO NOT MERGE
am: 790c343176  -s ours

Change-Id: I098c501721069dcbfe8dcce5fbdf9ef7a00765f2