Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: ea62e92c27  -s ours
am: 2b8164620f  -s ours

Change-Id: I14e677d8e0ebe7a4dd11885698154ea130df701c