am 9b76b2d2: Merge "framework:base: iterator error in singletone provider"

* commit '9b76b2d29fa338a128f699a1f40f7f5916a512af':
  framework:base: iterator error in singletone provider