Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9  -s ours
am: 18a4f6b083  -s ours

Change-Id: I94ebb6cf7bfcc632a8fa9fc608519f53b05f0a51