[automerger skipped] Import translations. DO NOT MERGE am: 790c3431 -s ours am: d4e9e430 -s ours am: 81ee5565 -s ours Change-Id: I28ff158e05ef538f043e2e4268d03b7a6caf2480
mentioned in commit 7715b809