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

Change-Id: Ib81ada30737497c41ba20d81b7e52fdf736e1a14