Merge "Base: Check severity in destructor" am: 19a7696488 am: 1f03df8155
am: dee214ba77

Change-Id: I47256df073b07427c7ed9ed44c2ccea9853a773c