Import translations. DO NOT MERGE am: 533e2a4716  -s ours am: e05c6051dd  -s ours
am: 2b9f890306  -s ours

Change-Id: Iad3d4209419658f90248c624b2f7daecf020b938