Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: aa13d0f09d  -s ours

Change-Id: I8580ef0aca3b98579053a3eae475167b2037c3ed