Import translations. DO NOT MERGE am: a680db2e1a  -s ours
am: ac60b39af2  -s ours

Change-Id: I8da0316b511945ed68ab7730def4038d7bc88bd5