Import translations. DO NOT MERGE
am: 4ba7435b4f  -s ours

Change-Id: I4ce4eb44e186ca827216c98809ff11e7e72d06e5