Merge "Import translations. DO NOT MERGE" into oc-dev am: c393596c -s ours am: e1e9f796 -s ours am: 52bc57e1 -s ours Change-Id: Ie711f4391d77c6e482638c062bfd365893fdc96e