am: 237b52f4 -s ours * commit '237b52f4': Import translations. DO NOT MERGE Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099