[automerger skipped] Import translations. DO NOT MERGE
am: 2483fe7558  -s ours

Change-Id: I3aa2e382368a5a4ee0f2ba42f8f7aa4430c0130b