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

Change-Id: I5ca109f81914aa3b92b7ebc69af2131b8390348a