Import translations. DO NOT MERGE
am: f9ef17c68e  -s ours

Change-Id: I513f51ecded981e02286080868d12e12e008c5d9