Import translations. DO NOT MERGE am: b4960d2ce6  -s ours am: 4881f571d3  -s ours am: c70aaaca99  -s ours
am: d6c7523ce3  -s ours

Change-Id: I8b335b8a30f736e4c5814b6f0bfc6b627a897918