Merge "Update ResourceLoader for Ib7fc2f939b"