Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e7c74c064f  -s ours am: da62d73d70  -s ours
am: cbedf9e437  -s ours

Change-Id: I6c311e67bd1a41767ab11847aa950c8819e3857d