Import translations. DO NOT MERGE am: f43d21db5d  -s ours
am: d30a6e3802  -s ours

Change-Id: Ica0e5342bba2ff6aefcbeaf38dc9f8b5fc18dbe7