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

Change-Id: I152e588b5ab81410544b2584f03d959489906148