Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 478cac680f  -s ours am: 0bf9837bba  -s ours
am: 5c07835325  -s ours

Change-Id: Iecdcb61614f6d88242f46863094ca696b28ea601