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

Change-Id: If7805af80ddfe145ad944817bacf72e010689b28