am: 10e29e07 -s ours * commit '10e29e07': Import translations. DO NOT MERGE Change-Id: Ic4105391ce9541d9073b45d7c5d69b4e2f2bcae5