am: 31cd8615 -s ours * commit '31cd8615': Import translations. DO NOT MERGE Change-Id: I90116fb8e02a06ab13cb9c7169371f931fdea508