Import translations. DO NOT MERGE am: 57906b3ef2  -s ours
am: 1e3c9b44a7  -s ours

Change-Id: I8a5a72dfe8012594aeaa033feebec45bb8c1def6