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

Change-Id: I4746838df8aa9d2735eaad669a982bd6d2a241db