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

Change-Id: Ie416c5ae84209d040cf587cc72d4a8c17b7b8d74