Merge "AML: Remove use of Bundle#setDefusable"