Merge "Merge "Fix index out of bounds when removing deferred containers" into rvc-dev am: 8da7870ba5 am: c69836c81e" into rvc-d1-dev-plus-aosp