Merge "Fix stale data due to stopped loader." into nyc-support-25.2-dev
am: 95bda21d46

Change-Id: If843c653fc0e340a8c993569e84ea642e389ba7c