Import translations. DO NOT MERGE am: aa26ed582c  -s ours
am: 8d858cb139  -s ours

Change-Id: I0a152a304b1af0b6a90dd7181c6cc209c0265712