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

Change-Id: I8d4b998707f586d0b1a6b93e8515d9dc44efd3be