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

Change-Id: I6de282dbe84110fef47a069ad6cd2dc17e9bea7f