Merge "Manually update the Resources configuration on changes" into mnc-ub-dev am: 59b0f66fd8 am: b07338e8eb
am: 8ff79e6874

* commit '8ff79e6874c4580b5062a1e19b6dd62c2973c3a5':
  Manually update the Resources configuration on changes