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

Change-Id: Idd19caa3fa488ec9a5db1bf45556c7b3b50d9ab7