[automerger skipped] Import translations. DO NOT MERGE am: 1896f3436b  -s ours
am: b1283460a2  -s ours

Change-Id: Iaf54d091ca2482b3d413f9e9796db9baff4406f9