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

Change-Id: I6bc53f75a32145fd03ab3940408ba32a2083cbfb