Import translations. DO NOT MERGE
am: 18a114896c  -s ours

Change-Id: I30e3484195290959d37dc3d947a06aaccfaf80dc