Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a483  -s ours am: a93169837a  -s ours
am: e69bfac15f  -s ours

Change-Id: I3f8653a0619f96a8d70d985556cdf7482caad386