[automerger skipped] Import translations. DO NOT MERGE
am: 5a4269d21e  -s ours

Change-Id: I311f91cf73c826e657061f3fdbafd6e6c9ac5fa9