Import translations. DO NOT MERGE
am: beccf38575  -s ours

Change-Id: Ia2d4662ee23cd055e00e6bdaeff690a17137944a