Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8e44108cf1  -s ours am: 0b076441a2  -s ours
am: 61e96d5a3c  -s ours

Change-Id: If05cb2d58a1a670a9d769a2b36cba5547d93a653