Merge commit '9b22c4f9' into fix-merge-conflict

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

Change-Id: I05daa36456a012a1b21b218e2bb5196ae7ad6d02