am ac214cd2: am 355d61bf: am 75766518: Merge "Compatibility hack" into mnc-dev

* commit 'ac214cd24f900f1a48cef50dc92672dd2d307ade':
  Compatibility hack