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

Change-Id: I667111d921a0661fcaa89cf66b572499f635190e