Import translations. DO NOT MERGE am: 11f9cf1ed0  -s ours
am: e3f8ff01f0  -s ours

Change-Id: Ib882ce383e5e5b3f304330cbe03fccc0c647a146