Import translations. DO NOT MERGE am: e59f5de  -s ours
am: 29c7a34  -s ours

* commit '29c7a347b92cc4696ac89248f03228944a57673f':

Change-Id: I428ab05040ef8033999a6cf3cf21107a073c7c69