Resolve "Bug in AdviceAdapter.java with superclass constructors" Closes #317856 See merge request !215