Import translations. DO NOT MERGE am: 42b1e9fe13  -s ours
am: 57656afcce  -s ours

Change-Id: I9a224fc7a96e549b2e70a8ae0e5024f6cd7f12ca