Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev