Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: d582629138  -s ours

Change-Id: I8465c92d839267a9fb85cbfcc89c69f84e61f854