Import translations. DO NOT MERGE am: 18a114896c  -s ours am: d79cff78c7  -s ours am: de9f8fbc91  -s ours
am: 4459e1a633  -s ours

Change-Id: Iab4f62f35bf9879e24428cba8b30987ec8e19cbc