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

Change-Id: I81e1ae56c7eb7c5cb2124e889e79e7a2fd186254