am 509b510e: Merge commit \'9b22c4f9\' into fix-merge-conflict

* commit '509b510ee16b6b478cd8acf97087245e496872de':
  Toro: Add overlay to use network mode 7 for cdma/lte