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

* commit '55a8378d4515fab962ae99e741195ebcfee84817':
  Removing deprecated overlay variables.