am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""

* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780':
  Revert "Frameworks/base: Fix a constructor"