Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 222cc10fee  -s ours
am: 289d6b71a9  -s ours

Change-Id: I30dcfc1b085a93df65ef63354e824c395ab8fecc