Import translations. DO NOT MERGE
am: 36c5d92e56  -s ours

Change-Id: I9e38b4398dc6ff92d7422347f4a85b6690e1f854