Merge "Fix Loader bugs" into nyc-support-25.2-dev am: af32863e1d
am: 073feaf3d4

Change-Id: I510afb25041c9336c4cea6e606822bd91abad5b7