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

* commit '59b0f66fd8e9011f76b7373f900c5acfa57114d9':
  Manually update the Resources configuration on changes