am 75766518: Merge "Compatibility hack" into mnc-dev

* commit '7576651801f639a682b38cc0697dd079c8df8fa5':
  Compatibility hack