[automerger skipped] Import translations. DO NOT MERGE
am: 6f52cfc821  -s ours

Change-Id: Ie9432dc64b559b374b19eeeb935f7ef7068c1ab3