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

* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
  Revert "Frameworks/base: Fix a constructor"