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

Change-Id: I3a5d12b0eec9df2789ea7465c4fe4f82c01ac320