Import translations. DO NOT MERGE am: c00e04f148  -s ours am: 1f0ff96186  -s ours
am: 58ba47cee0  -s ours

Change-Id: Ia1008c02386004c8eedeaac51e6b6d59d977fbd3