Merge "Frameworks/base: Remove unused field" into nyc-dev