Import translations. DO NOT MERGE am: 07edcb65d1  -s ours
am: 3a28377c51  -s ours

Change-Id: Ifde69d57826af6914704017154ee2fb7f77fc82c