Merge "Move StorageMeasurement to SettingsLib"