Import translations. DO NOT MERGE am: eb37d17be4  -s ours
am: 19ad508a58  -s ours

Change-Id: Ie9e99662c50807cd972e2a5588bf45a40b98c375