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

Change-Id: I03f2fc0b3802acdbc04fb053f8c8a8033602ca18