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

Change-Id: I75369b3d4c5dfa7ed1bb703c19a2e8c35251caf5