Merge "Import translations. DO NOT MERGE" into oc-dev am: 44141092 -s ours am: 46181531 -s ours am: c03209d4 -s ours Change-Id: Icdad97761639fac03173c8a597f2d7e1739c05f3