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

Change-Id: Ic67fdda57c0bcc3d2083424c373da6e2f726f95c