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

Change-Id: I3998a090b1802bd63bc3772832e38ae09d964b8e