Fixes for Cinder alerts

Change-Id: Ia71d7a69bfac7712ec0de7b3096a5c61bc1fa253
Related-PROD: PROD-19584
2 files changed