Import translations. DO NOT MERGE am: ebf1ae8b3e  -s ours
am: 7d824e3ad8  -s ours

Change-Id: Iff2f748c6813b81a7e64517111c30b0c0e046d01