am: 93e80748 -s ours * commit '93e80748': Import translations. DO NOT MERGE Change-Id: Ic44082939456434a33682a1f5c2cee4a0f4b3d9d