Import translations. DO NOT MERGE
am: 124e246546  -s ours

Change-Id: I5fb22c9294b570c9abc18d7c49eaef5a54d776c5