Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5  -s ours" into nyc-mr2-dev am: a22445abae  -s ours" into oc-dev
am: dbdfba9546  -s ours

Change-Id: Ia18ac187b0f64f03f0327b651b7befd7dd41d3c9