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

Change-Id: I8a345a6ab725c0607254902bbcd0a2e95758a77f