Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: c5729e0d53  -s ours
am: da9e4a1189  -s ours

Change-Id: I4bec174d41779ac3f7081023b3670d3e7f22eaf4