Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 52653734e3  -s ours
am: 33cdae61b4  -s ours

Change-Id: Ic9ed88f06f64635c3a99f5b0351f75842f243694