am 84974ff2: Merge "Removing deprecated overlay variables." into mnc-dev

* commit '84974ff246c24a5c65b5f9cd97f5f55d32a67fbf':
  Removing deprecated overlay variables.