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

Change-Id: I61cbd877649c980bae15d510c6655fa252ed2cf5