Import translations. DO NOT MERGE am: cd3475f3d1  -s ours
am: 590ee0a9f5  -s ours

Change-Id: I79d0be529a02a53a8c5b9ed0c3beb13680952ff2