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