Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 51e35963ae  -s ours" into oc-mr1-dev am: e3f6e69af1  -s ours
am: c6875184b6  -s ours

Change-Id: I86a2ccafeffab805caa0c4ff4d0cda2e7ac48d37