Import translations. DO NOT MERGE am: 9f26f7bcb4  -s ours
am: 4d5b0c5d89  -s ours

Change-Id: Iecf536057b94f6bfe30a76b3cff8cba8b9894674