Fixes to ignore deprecation warning, but error for deprecation scheduledChange-Id: Id97150703654620de96a5544c04d55996a126b6b