Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8cdce78cff  -s ours
am: a8bb9fde1d  -s ours

Change-Id: Ic372cc9054af1795e645c1d1ce6f4f5b3729ebdf