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

Change-Id: I937e72cca24e443f08da117a01a91ca7e41a5ca2