Import translations. DO NOT MERGE am: 46d4346dcf  -s ours
am: ae48142467  -s ours

Change-Id: I652d895f55c2d3c02a598ff6e5bb20cfa3f4da1a