Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2a2845a4 -s ours am: a9316983 -s ours am: e69bfac1 -s ours Change-Id: I3f8653a0619f96a8d70d985556cdf7482caad386