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

Change-Id: I4c1431dc1f947ccc7d96a23eb115f5e99896ab75