Merge "Import translations. DO NOT MERGE" into oc-dev am: 99c95f8dd8  -s ours
am: 3f36379bef  -s ours

Change-Id: Icf966d19f0bc77ddd2f8abbe111345672d059908