Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours am: 4d00a9512a  -s ours
am: a6eed85c8b  -s ours

Change-Id: I166a966d6e8f5a12431cff29072af05e31f5e2cb