Import translations. DO NOT MERGE am: d730a04ef7  -s ours am: db360b65d4  -s ours
am: 957c65fe13  -s ours

Change-Id: I01680e8da0f8b18b5de1f4acf0c9d421b5acf936