Import translations. DO NOT MERGE am: a5753cef6e  -s ours
am: 98d19da3d7  -s ours

Change-Id: I7ee5826dc0ee95155afbb3546adb5af10c896c77