Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: cec54ab2ae  -s ours
am: 325ff47270  -s ours

Change-Id: Ic753d3dc910d0334947076ca92e480e481366044