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

Change-Id: Id29c180f24029dfaae6f60abdfa021f12d5c4b2d