Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fab6fa3164  -s ours am: 8d7b081cda  -s ours
am: 0698939158  -s ours

Change-Id: Ib9686f96233ed55a2a600d306f3ed2643846bc39