Merge "Fix 5437700: Underlying backup method was exposed" into ics-mr0