Merge "Base: Check severity in destructor"
am: 19a7696488

Change-Id: I07f89e907304d754523f9026f857b5c94601b6e3