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

Change-Id: Id392eb1f08470e13f160832194c4655da66c3439