Import translations. DO NOT MERGE am: 1c43ca95cd  -s ours
am: dd04457fe5  -s ours

Change-Id: Icbe0f320f2009885dd5264662e79bcaf8084e54e