Merge "Removed IAE from HardwarePropertiesManager." into nyc-dev