Import translations. DO NOT MERGE
am: 750625ac2e  -s ours

Change-Id: Ie01c4c408d8d96fb87c5ca7e4e7d0154d274042a