am: 8ad820ef -s ours * commit '8ad820ef': Import translations. DO NOT MERGE Change-Id: If55e4d7f6ffde77bdce671f8c771f2fe2fe0d4b7